MVC changes made
Clean up - bug fixes - changes made to use the delegation pattern