Continued message composer, still needs a lot of clean up