Tests all pass
Tying up loose ends - mostly finished