Closes #26

with extra derps