More stub definitions, almost there...