Added skeleton code.

Added skeleton code based on the class diagram.
Slight cleanup