Lab2 is mostly complete. Just need to clean up some code