diff --git a/include/sp/protocol/MessageBase.h b/include/sp/protocol/MessageBase.h
index 57e291c..f0b7576 100644
--- a/include/sp/protocol/MessageBase.h
+++ b/include/sp/protocol/MessageBase.h
@@ -129,7 +129,7 @@ template <typename TBase>
 class MessageImplFieldsWriteBase : public TBase {
   protected:
 	void WriteImpl(DataBuffer& buffer) override {
-		//TODO: add endianess
+		//TODO: add endianess + write ID
 		auto& allFields = TBase::GetFields();
 		std::apply(FieldWriter{buffer}, allFields);
 	}
@@ -142,6 +142,7 @@ class MessageImplFieldsValidBase : public TBase {
 		// Access fields via interface provided in previous chunk
 		// auto& allFields = TBase::GetFields();
 		//...	 // validate all the fields
+		return true;
 	}
 };
 
diff --git a/src/main.cpp b/src/main.cpp
index 20e93f5..cf70156 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -24,5 +24,7 @@ int main() {
 
 	std::cout << "KeepAlive2 : " << keepAlive2->GetField<KeepAliveId>() << "\n";
 
+	//TODO: write ID and factory
+
 	return 0;
 }
\ No newline at end of file