Massive whack of code from the last few days. Alot of changes.