wow, forgot to commit awhile. clean-up pending.