move shared stuff back out