got everything reorganized. now to debug