More stuff. Now have to test on uni comp.