setting up basic models
stupid merge conflict on pyc files