laying out work

Builds failing still.