Module now working perfectly. Still needs dynamic allocation
Bisschen cleanup