Break out section data into separate module. Should work, but we'll see
Fix references, rename function