final commit. removed the proxy and the facade since they're very commonly used in our team