Updated model with recent work.

Need to revise aux and collector calculations.