Feature 1

Finished working on feature 1. Please merge.