Mosaic fixes and adding in foundation