add tagged stuff, change the way macs are stored