Working in #7
Tests updated to match new functionality