Covering Bases

Update 3
- Changing some inheritance