Quick overhaul
Adds 100% coverage