Major db changes plus BuildingEdit implemented