converting some of the organizer over