not quite there yet but getting closer