Updates to endpoint arguments, and some WIP implementation.