Tracking v1

Tracking works but only in some cases and there are some issues
transferring to the block list.