Merge new base project into master

Rebuilt project that is cleaner