I just finished this, just writing some tests and will be on testflight soon