Add collisions and demo work