Add Shape collision type getter/setter
Update TODOs