more work towards minimal javascript client