Large vanilla changes to compiling, enhancements and bugfixes. Beginning of incubator functionality.