Merged off branch development

Removed previously corrupt project and replaced with current development
off branch and functional project.