Action manager cleanup for new messaging.
More messaging work.
Work in progress junk.