Mike and Connor's Lab3 submission