Standardize stuff and add ExecuteMe
Merge in changes