WIP: Adding Tags field.