Code complete all TESTS GREEN :)