Bit more stub work