First pass on integrating id tracking
3 files changed