Just working on some design issues.
