Let's hope this makes things scalable