Updated. Adding feature and getting ready for MVC based system.