Tested Individuals and Orgs, fixed errors, exposed some bugs

Merge this, update, and run migrations pleaseeeeeeee