Checking in missed files ... Calculator and Markup Model