Continued development on messages