Needs some work yet, lab 2 and 3 on the right path though