Refactor ID code to make for easy transition once this is figured out