finished add on class mostly