Lab3 complete (without challenge)