made some changes but keeping seperate until MVC is straigtened out