cleanup and adding in foundation.