Add basic collision behavior
Add barrier
Improve collision behavior