Refactored a bunch of models/services until I ran out of brain power.