Upgraded to 2.0 with many changes! Still working on some updates.

Most needed stuff is noted in the README.