First commit, proxy working