Adding to models, refactoring stuff.