lots of work towards next version