Commits changes from Sunday 3/2 session with JR