moving addins to each class - fk stretch done, ik not quite