Finally Complete!

Committing all of the necessary assignments