test with solution/results types instead of model
test with solution/results types instead of model
removed all model structs
merged with master