Route Groups working! :D
Cleaned up Route handling a bit