Got things ready for integration with Craig's stuff. Just need the right
things to call. And need to finish UI stuff now.