working on #28
added stuff