WIP. remove heirarchy temporarily