Merged main into samia and added java doc for a bunch or organizer funcitons #153

Closed samia225 closed 1 day ago