Last MInute OVerhaul almost done

Last minute overhaul almost finished. Just need to review it more.