Work on requirements

 * Rewrite some of the changes made after midterm
 * Added additions and removals
Merge branch 'requirements'