Annotations Everywhere

Closes #43