Finished with enough to merge this, still need webhook integrations