Upgrading to lab 4

Closes #77