Misc Refactor, still haven't found path bug