Added testing (kinda working)