Proposal hierarchy initial work

Left some budget methods that were not in my way in on purpose so Doug can reuse. If not needed, I will remove. There are some minor issues left to fix but I think the most critical part is done.
OK, let me fix this.