WIP - DO NOT MERGE

Messenger refactor