closes #242
mocks up #241
closes #241