Initial work to handle objects