better testing, still bugged