Clean up initialization code
whoops
Add new web interface
Removed junk
Merge branch 'feature/new-web'