Commit 2

Mostly Done