Adding Setup for Working To Try and Limit Conflicts