Complete recoding, eliminating a lot of fluff and JavaScript issues!