diff --git a/mod_pottymouth/conf/mod_pottymouth.yml b/mod_pottymouth/conf/mod_pottymouth.yml
index 228a22e..d257b60 100644
--- a/mod_pottymouth/conf/mod_pottymouth.yml
+++ b/mod_pottymouth/conf/mod_pottymouth.yml
@@ -1,8 +1,8 @@
 modules:
     mod_pottymouth:
         blacklists:
-            default: /etc/ejabberd/modules/mod_pottymouth/blacklist_en.txt
-            en: /etc/ejabberd/modules/mod_pottymouth/blacklist_en.txt
+            default: /home/vagrant/blacklist_en.txt
+            en: /home/vagrant/blacklist_en.txt
         charmaps:
-            default: /etc/ejabberd/modules/mod_pottymouth/charmap_en.txt
-            en: /etc/ejabberd/modules/mod_pottymouth/charmap_en.txt
+            default: /home/vagrant/charmap_en.txt
+            en: /home/vagrant/charmap_en.txt
diff --git a/mod_pottymouth/src/mod_pottymouth.erl b/mod_pottymouth/src/mod_pottymouth.erl
index e50c9f8..0c51ded 100644
--- a/mod_pottymouth/src/mod_pottymouth.erl
+++ b/mod_pottymouth/src/mod_pottymouth.erl
@@ -21,9 +21,11 @@ getMessageLang(Attrs) ->
   if
     LangAttr ->
       {<<"lang">>, LangBin} = LangAttr,
-      Lang = list_to_atom(binary_to_list(LangBin));
+      Lang = list_to_atom(binary_to_list(LangBin)),
+      ?ERROR_MSG("LANG: ~p~n", [Lang]);
     true ->
-      Lang = default
+      Lang = default,
+      ?ERROR_MSG("LANG DEFAULT~n", [])
   end,
   Lang.
 
@@ -50,6 +52,11 @@ filterMessageText(MessageAttrs, MessageText) ->
   % we get back bytewise format terms (rather than utf8)
   list_to_binary(string:join(filterWords(MessageTerms), " ")).
 
+filterMessageBodyElements([H|T]) ->
+  lists:map
+filterMessageBodyElements([], Element) ->
+  Element.
+
 start(_Host, Opts) ->
   Blacklists = gen_mod:get_opt(blacklists, Opts, fun(A) -> A end, []),
   lists:map(fun bloom_gen_server:start/1, Blacklists),
@@ -67,18 +74,76 @@ stop(_Host) ->
 on_filter_packet(drop) ->
   drop;
 
-on_filter_packet({_From, _To, {xmlel, <<"message">>, _Attrs, [_chatState, {xmlel, <<"body">>, BodyAttr, [{xmlcdata, MessageText}] = _BodyCData} = _MessageBody] = _Els} = _Packet} = _Msg) ->
-  FilteredMessageWords = filterMessageText(BodyAttr, binary:bin_to_list(MessageText)),
-  {_From, _To, {xmlel, <<"message">>, _Attrs, [_chatState, {xmlel, <<"body">>, BodyAttr, [{xmlcdata, FilteredMessageWords}]}]}};
 
-on_filter_packet({_From, _To, {xmlel, <<"message">>, _Attrs, [{xmlel, <<"body">>, BodyAttr, [{xmlcdata, MessageText}] = _BodyCData} = _MessageBody] = _Els} = _Packet} = _Msg) ->
-  FilteredMessageWords = filterMessageText(BodyAttr, binary:bin_to_list(MessageText)),
-  {_From, _To, {xmlel, <<"message">>, _Attrs, [{xmlel, <<"body">>, BodyAttr, [{xmlcdata, FilteredMessageWords}]}]}};
+% on_filter_packet({_From, _To, {xmlel, <<"message">>, _Attrs, [_chatState, {xmlel, <<"body">>, BodyAttr, [{xmlcdata, MessageText}] = _BodyCData} = _MessageBody] = _Els} = _Packet} = _Msg) ->
+%  FilteredMessageWords = filterMessageText(BodyAttr, binary:bin_to_list(MessageText)),
+%  {_From, _To, {xmlel, <<"message">>, _Attrs, [_chatState, {xmlel, <<"body">>, BodyAttr, [{xmlcdata, FilteredMessageWords}]}]}};
+%
+% on_filter_packet({_From, _To, {xmlel, <<"message">>, _Attrs, [{xmlel, <<"body">>, BodyAttr, [{xmlcdata, MessageText}] = _BodyCData} = _MessageBody] = _Els} = _Packet} = _Msg) ->
+%  FilteredMessageWords = filterMessageText(BodyAttr, binary:bin_to_list(MessageText)),
+%  {_From, _To, {xmlel, <<"message">>, _Attrs, [{xmlel, <<"body">>, BodyAttr, [{xmlcdata, FilteredMessageWords}]}]}};
+
+% chat message with chat state
+% on_filter_packet({_From, _To, {xmlel, <<"message">>, _Attrs, [_chatState, {xmlel, <<"body">>, BodyAttr, [{xmlcdata, MessageText}] = _BodyCData} = _MessageBody] = _Els} = _Packet} = _Msg) ->
+%  ?ERROR_MSG("CHAT CHAT MSG W CHAT STATE: ~p~n", _Msg),
+%  FilteredMessageWords = filterMessageText(BodyAttr, MessageText),
+%  {_From, _To, {xmlel, <<"message">>, _Attrs, [_chatState, {xmlel, <<"body">>, BodyAttr, [{xmlcdata, FilteredMessageWords}]}]}};
+
+% chat message without chat state
+on_filter_packet({_From, _To, {xmlel, <<"message">>, _Attrs, [MessageBody] = _Els} = _Packet} = _Msg) ->
+  ?ERROR_MSG("CHAT MSG WITHOUT CHAT STATE: ~p~n", [_Msg]),
+
+  # {xmlel, <<"body">>, BodyAttr, [{xmlcdata, MessageText}] = _BodyCData} = _MessageBody
+
+  if message type chat/group && !archived
+    foreach body
+      FilteredMessageWords = filterMessageText(BodyAttr, MessageText),
+      {_From, _To, {xmlel, <<"message">>, _Attrs, [MessageBody]}]}};
 
 on_filter_packet(Msg) ->
   % Handle the generic case (any packet that isn't a message with a body).
+  ?ERROR_MSG("FILTER PACKET MSG: ~p~n", [Msg]),
   Msg.
 
+% PSI one-to-one
+% {
+% {jid,<<"foo">>,<<"kalamari">>,<<"Psi">>,<<"foo">>,<<"kalamari">>,<<"Psi">>},
+% {jid,<<"foo">>,<<"kalamari">>,<<>>,<<"foo">>,<<"kalamari">>,<<>>},
+% {xmlel,<<"message">>,
+%  [{<<"xml:lang">>,<<"en">>},{<<"type">>,<<"chat">>},{<<"to">>,<<"foo@kalamari">>},{<<"id">>,<<"aacba">>}],
+%  [{xmlcdata,<<"\n">>},{xmlel,<<"body">>,[],[{xmlcdata,<<"hi">>}]},{xmlcdata,<<"\n">>},
+% {xmlel,<<"active">>,[{<<"xmlns">>,<<"http://jabber.org/protocol/chatstates">>}],[]},{xmlcdata,<<"\n">>}]}}
+
+% gloox muc
+% {
+%   {jid,<<"#12345">>,<<"conference.kalamari">>,<<"bar">>,<<"#12345">>,<<"conference.kalamari">>,<<"bar">>},
+%   {jid,<<"bar">>,<<"kalamari">>,<<"12145048529523376186799">>,<<"bar">>,<<"kalamari">>,<<"12145048529523376186799">>},
+%   {xmlel,<<"message">>,
+%     [{<<"xml:lang">>,<<"en">>},{<<"to">>,<<"#12345@conference.kalamari">>},{<<"type">>,<<"groupchat">>},{<<"from">>,<<"bar@kalamari/12145048529523376186799">>}],
+%     [{xmlel,<<"archived">>,
+%       [{<<"by">>,<<"conference.kalamari">>},{<<"xmlns">>,<<"urn:xmpp:mam:tmp">>},{<<"id">>,<<"1471940767114309">>}],
+%       []
+%   },
+%   {xmlel,<<"stanza-id">>,
+%     [{<<"by">>,<<"conference.kalamari">>},{<<"xmlns">>,<<"urn:xmpp:sid:0">>},{<<"id">>,<<"1471940767114309">>}],
+%     []
+%   },
+%   {xmlel,<<"body">>,
+%     [],
+%     [{xmlcdata,<<"HELLO THERE">>}]
+%   }]
+%   }
+% }
+%
+% {
+%   {jid,<<"bar">>,<<"kalamari">>,<<"12145048529523376186799">>,<<"bar">>,<<"kalamari">>,<<"12145048529523376186799">>},
+%   {jid,<<"#12345">>,<<"conference.kalamari">>,<<>>,<<"#12345">>,<<"conference.kalamari">>,<<>>},
+%   {xmlel,<<"message">>,
+%     [{<<"xml:lang">>,<<"en">>},{<<"to">>,<<"#12345@conference.kalamari">>},{<<"type">>,<<"groupchat">>},{<<"from">>,<<"bar@kalamari/12145048529523376186799">>}],
+%     [{xmlel,<<"body">>,[],[{xmlcdata,<<"HELLO THERE">>}]}]
+%   }
+}%
+
 mod_opt_type(blacklists) -> fun (A) when is_list(A) -> A end;
 mod_opt_type(charmaps) -> fun (A) when is_list(A) -> A end;
 mod_opt_type(_) -> [blacklists, charmaps].