Working on new bootstrap interface
Completing refactor