changed over to model/view/controller; same functionality