Fix error with route parsing
Major refactor of constructors #28