Final Submission before deadline

More changes will be coming, but this will be the last change for a
couple of days