Slather it up and add test coverage