beginning of beautiful message refactoring
major refac