Some more work to get Independent from BC. This does not compile at the moment.