Break out the adb and heimdall stuff better