ok; still some bugs that had to be fixed