UNTESTED - Propagated all changes regarding variable anonimisation through all existing functions.  Next phase is testing.