a bunch of changes in here
Merge branch 'foundation'