untested draft
fixes and name changes
tag functionality