Cleaned up part of lab 3 code, lots more to do