pulled from github
rough iter2
Merge https://github.com/jassicacanidy/CallistoReinvented