Initial commit containing basic tracking