Revert 785aade..7d87a79

This rolls back to commit 785aadece630d43b1a6b468db03d3405844c9458.
Working Version of Kinetic Measurement