First pass at refactoring
All tests passing after refactoring the interface with HTMLBars

Still needs cleanup
Remove debugger
Update HTMLBars and get tests passing