ran more tests, wrote some stuff