Functions ready, test works
Integrating the files