shelved
Merge https://github.com/DarkCthulhu/Misc-Experiments