Merged with colin and added audio back in

Crunch crunch crunch