Adding layout support.  Clean compile, but missing many tests.  Some existing tests fail.