Made a better (hopefully) hierarchy