Adding some pathing functions
Some merging issus