Finish up meta work, more tests, refactor routes