Closes #13

#13

Do this after #1 and #4