Handle args better, handle existing branch better