Polished off the auto validation for now only on shop model.

Signed-off-by: Tom Green <kingofcuddles@gmail.com>