Restructured the router to allow non-copy content
Added some handy macros for the brave and/or lazy