More bug fixing, fixed more issues with routes, will fix flash in a later commit.
Cucumber tests up and running, most past, and a couple are giving false positives.