Added rmtSent flag setting internally
Updated TODOs
Moved includes outside of C++ guards