added content tags - need to work out getting attributes in a map and mac times as well, but general poc is there