edit and comment out some stuff for now