Added a bunch of new slug classes. Moved some stuff around as well.