Add audio engine
Minor refactor