Moved towards a working version, but still some operation stuff to hammer out.