Building Expansion plans

(these are proposals and are subject to change.)