Shuffled the skills stuff around a bit.. also removed some deprecated code