major rework of scene and object abstraction
resolve merge conflict
resolved merge conflicts