Huge commit after todays class