Brand new with lots of changes and clean up

querypath instead of simple html dom