924baac Got it working again, rewrote tests