Hopefully this can be used to merge the current Forge stuff to my own

And not the other way around, since my branch is a clean version of 5 months ago or so...  This new system is less than fully intuitive. ;)