New zero switch logic, cleaned up shooter.

Testing soon