attempt upgrade to es libs - backed out for now due to weird class compilation error