Tidying
Redoing the client to proxy resources locally, and handle caching