Modelling a whole building stock: domestic, non-domestic and mixed use. Issue 2 (17th February 2019)