Added some format helpers
Working on routing