Commiting further work.
Adding latest work.