starting point
added stats views
fixed conflicts