Reorganized and added Pathing