Kamouscuse intermediate commit, got some issue with memory management to fix