Re-implemented stack message system, now much simpler