Marigold - 1

beginning of my modifications