Done stuff

collision and shop items