I expect to instantiate in bootstrap for now and move into system later. What do you think