start of big front end refactor
fix bugs in wip refactor