Tests STILL won't work, but added a nice interface to work with. So there's that