Mweb 1043

@nandy-andy @RafLeszczynski @rogatty 
OK, I will name them suitably to the entrypoint that uses them.