Revert "Cleaning up some stuff"

This reverts commit ce9ac1b6428534b10be8d2868e4c701bc64ab5d1.
try temp storage
putting it all back