Adding code to ease up testing. To be removed before merging to master
Completely working, looking ugly