Significant refactoring.  Using templates, jQuery and MVC now