Added some models and helpers and stuff...