Adding speaker.
Updating paths and integrating Peters work.