Changing over to use actual mine.

Not ready for test yet.