demo working
fixed conflicts
cleaned up