Move some stuff to Graphene