Finished merging Tristan's Branch into master