There are still several leaks that I haven't figured out but for the time being I'm uploading this branch/MR.