2nd commit still lots of work