tracking locations as well
clean up header dependencies
format