#14 Added preliminary Spring wiring