Streamlined the callbacks. Trying to sort out the proper destruction of building data.