somethings working but not so great
fixed conflicts