Clean up Tracker
clean up helper
actually handle errors properly
use new lookup method in controller
add tests