naive test, fix some stuff