adding some bits I worked on but had not put in github yet