Final Changes Before Demo

Don't change anything you guys
Don't do it