Initial crack at re-building in an object based fashion