Updates to controller & model, also added content-negotiation