Did a little more work on the foundation theme