Refactored tracker
Added step by step container