more updates getting it to do what we want