Initial development

Ready for SAP team review