[BUG] Closes #29 with rudimentary client-side handling for testing