Continuing to refactor to try to get something more useful.