Sort of has a layout now.
More simplifications.