Added more structure

Time for bed.