First pass: add collision Shapes to Model