more sketching in the dark, but layout of module seems mostly complete