Initial layour - for real this time

Yeah I forgot a comment... Lesson learned: double check before I commit.
:)