Shuffling things around. Endpoints appear to conform to API docs.