Form half done

Commands needs to be looked at before continuing