Fixing some errors
Implementing base of new models