Continuing down the path of removing statics, and static calls. Reworking bootstrapping.