oops..lots more functions working without commits...