Updated by coolAlias, see notes

This will have errors until I add the correct methods to CommonProxy