Adding tracking, first test