Slight refactoring, Kinetic plugin complete