Move some stuff, add some checks