WIP moving to self-contained module