Move some funcs around