Added authorship and TODO list
Addressing conflicts from Brian's edits