Switched to using an actions table based on each class, avoiding dupes
Fixed to work.