Started basic refactor. Created privacy flag.

Used Python 3.x style dictionary writing. Fixed magic dictionaries.