March 6th work

Here are the changes that we made today while pair programming, ready for merging!