Interim commit: prototyping server-side handling