Scrapped NSMutableDictionary, went back to arrays. Added Punch class.