Add more involved means of associating hits with tracks