Step 5 working. Also, closes #62