WIP
Change Brenner to use tags rather than numbers