Still broken collision handling. Works a little better