redid some stuff, up and running