Updated to include the evening's work

Please enter the commit message for your changes. Lines starting