Got everything working, now to update the tests to match