Snapshot of my last commit on a rewrite with Spring