Remove branching artefact
Fix up dao and test
Add README