Further work

More work done on form...