New stuff about 98% done, still need to tweak it a bit!

New stuff about 98% done, still need to tweak it a bit!