Working on incorporating team contributions