Made some tests, fleshed out the class