Sorry, didn't work on it yet :( But I will make this PR ready for merging