Add basic outline
Build with theme for hosting
Update build
Cleanup merge