All tests passing

Yet to split commits per feature/issue