commit with chat added. not finished though