Trying this again
Some reshuffling and cleanup
Merge https://github.com/joshr2121/Ricorso-1
stuff
stuff