Changes to model and added audio view