Added pathing - needs to be reworked