Reverted to old gkahn. Now works again
Moved things around
copied changes from gkahn
updated, should be fully compatible with gkahn now