Issue 2

Finished Issue 2