ClassBags Re-write