Temporary commit. Looked into forcing variables into different scopes based upon decorator options etc