Add server-side checking, feedback and saved state