Move some stuff, start thinking about how to specify setup tasks.