Final commit before talking to prof