Further development

Work in progress