More work on trackit custom code