Getting more working.

Still sorting out code.
Will edit it a bit later.
Finished the switch to organization.