Reworked some of the models. Rearranged some code. Using better equality checking. etc.