All tests passing after refactoring the interface with HTMLBars

Still needs cleanup