Major refectoring, updated modernizr, preparing to version .3