Reverted back to successful build; eliminated data model completely to restart from scratch