Implemented Macro Dialog & TokenLocation functions