Just wiring everything up and improving tests
Coverage of edge cases