master - NEW: i think im getting closer to figuring this out