Added stuff, need to figure out how to alter the ENUM