Cleaned up model, now messages pass, commented out all direct.