fix up some stuff, realize need more structure for operations