Added a few routes, and helper methods