Reworking to use results. Fixing validation bugs in model.