I will check the branch and look around the code. Some of the questions probably need answer from @LN
