getting closer to making it scalable