Redo...I forgot the save some stuff from the last commit