did some work
fixed conflcits
fixed removeal