Clean it up a little.
Add TODO for remote endpoint.
Add TODO for rename endpoint class.