Corrected merge errors I left behind, added a simple bootstrap interface