Closes #4

#4

Do this after #9