Syncing up github before I start implementing changes that I worked on with Michael Muse