Cleaning up todos
Expanding router to handle hash changes