making progress

still a lot to do