Work on buildings and plans and expenses and header
Fix conflict :|