cleaner organization
getting closer to a good queue