Hackjob to handle paths.. need to be cleaned up in the future