moved some stuff from the intro here