closes #19
closes #19 truly