Resolve issues with command registration
Migrate to new Particle utilities
Redundancy ;3