Continue to consolidate into many classes