1-8 commit, even better pathing! code cleaned up slightly