Initial commit of changes for history tracker