Rearranged some things and added the visibility.m4 macros. Started to lay the