more debugging, can't wait to rebase all this