Adding meta data stuff and sanity checkin