Future development

Complete overwrite please