Began implementation of time/usage based tracking