Third commit; progress on lab 2