Begin factoring messages into separate file