New solution
Added models and contexts
First prototype