Major overhaul includes adding many fields, defining extraction function, eliminating sandbox