lots of changes. looking good in small factor. larger to be done