Bring water, remaining salt and oil to a boil. Cook macaroni for 8 minutes wash, drain, and rinse. Cool. Combine eggs mixture to macaroni and mix lightly. Refrigerate overnight in a n air tight container. Add remaining ingredients the following day.