Moving to OAConstants
Adds volume control