Fleshed all classes out just a little more. Eliminated compile errors.
No functional changes, just aesthetic.