The logic will need to be adjusted for DAL model issues, but the current functionality is preserved with this.