Spring cleanup
Making progress