makin stuff better, passing tests