Initial thetas, refactor of models