add Message and Person
pushing stuff that we played around with