Initial changes to lab 1 (not 100% complete)