Checking in some half finished changes. I am bad