Tested and stuff

Things aren't working quite right...