still working on tests
Merge branch 'jenny'