Feature 1 is implemented

First commit on Feature 1