WiP

Added tracking stuff.