removed some from classes
got scan to update count on punches