Continued development

Still in progress