closes #60, kind of