have isolated the class from original all-in-one file. changed master to be object local property