Added validation
Added validation, unit tests, catalog display, functional tests