Add unified tracking and logging, fixes #12