read my global review... you should fully rework this PR. that's why i've closed it