Clearing up my branch for merging with Tristan's branch.