My current reworking of my Teamwork code