Fix all the things
merge all the things