Wesby makes use of the brand new endpoint-proxy
Closes #29
Merge branch 'enhancement-#w29' into develop