current working code w/ all tests