Complete overhaul

Work in progress. Implementing bootstrap.