Get foundation working 2

Branched off of get-foundation-working