HUGE changes part 2 - Not working yet.