Update to version 2.0

Completely rewrote code, amongst other things. Frodo Compatibility.