switch local messages to objects
message restructuring