Working on fixing the form serializibility