MAJOR div overhaul
fixed merge conflicts