Closes #18, i think