add new client code; use computational-geometry
remove old client code