Adding a modified version of the outline discussed on Feb 15th