Heirarchy mostly in place, frameworks added