closes #30 I guess