Rushmodel

Cleaned up the model and feature functions.