Big refactoring.. Now picks up nodejs modules, but needs alot of fine tuning