Moving over to team alias system. I also refactored quite a bit more. Consider working but a little buggy.