Better ktis system and teams
First commit in a while!