Added shapoid class and gfx