Closes #77, not completely pretty