Readying this class for testing

Gotta test that.