In-progress work on audio etc
Update to build tools 18