Adam

Merge with updated controllers for view construction