Continued Refactor with Foundation