object apretn class defined, cloud child class defined
hopefully resolved merge conflicts