There will be some small merge conflicts here that I can handle.