Another WIP commit… getting closer.