hmmm took out unused stuff in model, change function names
merge