Working towards filling in the stub