Finished "Module" Data Type
Merge branch 'JE_Branch' into FA_Branch