This isn't correct, but a quick commit before I start over.