changed like 15 classes to add like 3 lines, mike remember to check for
null thanks this took us an hour