TAA-16: Beginnings of implementation and testing of database proxy. Also some changes to remove the content provider