Eliminated class variables. Prepping for overhaul of code class system to better support cacheing