Stuff is still broken, but closer.   Deal controller needs tweaking.