finalized setup with spring. Renamed a few things while testing some theories