TODO update

Tags seem very difficult to do in a configuration-friendly manner, so those will be pushed out a while.