Really disorganized update - annotation refactor, and a bunch of small features that were waiting on these changes.