included skeletal builds for potential classes.
fixed merging conflicts
Merge branch 'tempDev' into development