initial commit
change names of some stuff