quite a few changes, still working on the teambuilder