Updated caption, moved model methods from controller into model