Attempt to sync MattparksCore with this repo