0.8 - only left to wire up to do actual test and create some tests (mocked)