First commit

Layout more or less complete