ReturnTeams

Started to build to return teams method and generally cleaned up code