adding some test, code currently broken, todo fixing it...