Partial commit. This is just too much of a mess not to re-write.
Merge branch 'master' of https://github.com/PastafBlocks/PastafBlocks