The terrible for loop removed. Tests will come soon