Overhaul

I need to dump this here... I am getting close to a finished product.