Rewritten existing routes, added HTML test file
WIP on test.html