more work on tags

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
peping

Signed-off-by: Alexander Skjolden <alex@plastboks.net>