I guess this would be moved to shared as well?