Thankfully no longer using an endsWith