Adding correct web endpoints and hooking up the pieces