Move some things into shared