Ahhh ... add the new classes