Refactor - separate out speach stuff into a different tool