Andrew: Creating new client/server and test/spec code separations.