Added tracking board
Refactored