EditModule Work 3

Completed (I Think)
Merge branch 'JE_Branch_EditModule' into JE_BranchV4