Safety commit. Chat is working. kinda buggy