closes #85 maybe