Made some modifications to original design to keep with MVC standards of naming and such.