This is a strong update to the code, but is only the base for some later things. I'm going to sit down tonight 11/3 and hopefully churn something out for our meeting tomorrow.