Un-doing the spring framework, best version yet.