Begins merge with Petter's updated code.  Hold onto your seatbelts.
Updates my wrappers to match Petter's new interface.