Completely overhauled the wkb module