API finishing touches, merge to branch to push to master