getting closer to finish this