Commented out certain paths, added map things