moved parser to own file, added more fake messages