Cleanup all the classes, implement static base.

Next up: Get/set methods, and cleanup of logic.