Added status tracker (work in progress)