Template Changes

using foundation as a base now