That endpoint thing isn't going to work

Not sure how to handle it yet, but that was the wrong approach.