Renamed some things, and removed Client::index