Added the skills. Cleaned up some stuff. Started working on the COMP.