WORKING

Global calls are now removed, using class self. properly.