Closes #37 for now.
Beginning of #39