change list items integrated into the other stuff. It's not pretty but it's probably getting close to complete.
