Working as expected and stable! starting work on 'Add a Message' function