First draft of mixer ready
Merge branch 'master' of https://github.com/KathyZ/richardParker