Started implementing server validation