some changes that made things more messy, but getting closer to a finished product