Not a good point to commit, but want to clean up a bit.