Adding basic generator stuff