Added a better step tracker, that actually works