Added shape objects (WIP)