Refactoring + Bug Fixes

Added increased multi-controller support
Fixed team-specific loading npe’s