More comments and stub code