better local message handling
update design doc
restructured according to design doc