Close GH-13: Foundation update. Fixes #11, Fixes #14, Fixes #6, Fixes #5