Some updates and starting to work on messages