Move to new stomp library, still testing