Really test it and fix problems