#14 Finished Spring integration (still needs some polishing)