most things are working I think!
merged conflicts