Added foundation
Merge branch 'foundation'
Removed extraneous comments