Final check of the client side code. Closes #23