Reworking models to properly use teams, started tests.