pieces work
fixing git changes