commit functional tests before a refactor
Refactor complete
foolish mistake, fixed
Front page html now generated from template, tests more verbose