Type and grid coming together. Margins now exist.
some cleanup before major structural changes.