Initial generator - need to fix