Getting closer. Annotations are still off a bit.