Furter decentralisation of functions and better end screen messaging(under constr)