Still not pretty, but getting closer