merged full foundation 5 into branch

Working on #4 and pulling in foundation