some work on todos... getting closer