Added a flagging system
Cleaned up comments in router file
Merge pull request #70 from nathantross/flagging

Flagging