Move the marvin configuration out of here.