Added in rudimentary client-side checking