New Master Branch. Working on collide