getting closer to updating this thing