031-Mass & balance

Work in progress