Clean-up before the remake
Initial remake, and it works!
Unit-tests