Did some stuff

Also set up a test