Foundation

Merges foundation into the master branch