Added helper functions
Added TODO
Added module compilation
Refactored variables for clarification
Refactored function name
Fixed correct data return