Added basic tracking

Added basic tracking