Added rudementary stop tracking