Frontend dev ready to merge, no errors in testing, now with teams/team view, and more