ugh

some improvements still no final path