[xTools] xTools rewrite underway