basic changes
Merge branch 'Cycle2Ryan'
merge
Added file headers