Refactoring, work on input validators continues.