Rough layout complete

Not pretty, but roughly functional