added some collision - needs much work