Added collision.. still need to work on it