Issue #1
- Begin work on remaining Base Classes