Final commits before project submission. Still a lot to fix!