Work on Base and Building to add update