Preparing for huge Update

I am going to change this code drastically. Getting it ready.