preps client-side for data, client-server refactor