More changes, still not working
All unittests are now working