Added box and finish, and implemented collision