Update the endpoints

Don't merge yet
wont with the `overhaul` branch