Commit before 240 lab w/ group; will continue later tonight