Decided to Spring 3.2-ize this.  Plus it is time to actually starting making it better