merge jordan's missileshoot additions