First Commit
Initial Design
Merging from pages
Fixing merge issues