Initial quality

Ready for SAP team review