added lazy loading for development, needed for permissions later