closes #17, continued #18