Reworked heirarchy for simplicity