Fully merged and working (as far as I know)