More todos
Finishing up simple router, adding comments, clean up