module refactor. prep for tracker.py