Let's do this as needed/as we see conflicts? I want to keep it as readable as possible ATM