still fixing but getting closer