bit of progress on hierarchy support