More beta DI code

Getting a plan... Slowly... And compatible with the existing builders.