Getting ready for #18
#18 is complete.