attempting to add some performance improvements...committing so I can switch locations.