Updated for two sample projects - Account and Calculator