Rough additions and layout