starting to swap in the proper path lookup