Fully switching over to resuable installer function and fixing some bugs