debugged and fixed hierarchy structure
resolved conflicts/merged..must finish case statements