Switched many things over to typeslot