****TOTAL ORGANIZATION REVAMP*. Security fixes as well.