Closer to complete. Definitely works now just needs more testing.