updated TODO comments
SystemRequest/Response implemented