Updates to have this work with the normal layout controller, and test updates, and cleanup.