Organizer updates.

 NOT FINISHED