Started SIS bootstrapification and refactoring