First pass at getting extra data