Completed first draft of newly decoupled module