Initial version capturing most data