Going back a step to fix the crazy mess that is trolley tracker