More ^%$ merge conflicts; we gotta go over this