Closes #13

#13

Do this after #9 and #11