Markup and Margin not done yet - end of day