intermediary commit - Small progress
Fix building the full org map