moved some things around

do not merge