UPDATE AND REFACTOR IS GO. DID SINE_TEST, PROJECT REFACTORING AND SOME MORE (PROBABLY)