models work
fix association
models and beautiful view working (jk), day1
first iteration
fix merge conflict