Moved most non-hooked function changes into hooked versions where possible
Small test at adding custom skill trees