Fill in some TODO - need generator yet