First Commit

Almost done