Large commit before before Submission, need to maybe clean some things up only