Track default

This both tracks default, but also rewrites the handling of stars (*, 2*2, etc). Removed templates.