Some additional STOMP work.