moved some things to .exports