First layout approach

Still needs some commenting