Quite a few changes, condensed a bunch of groovy code and ensured
correlates work.

Signed-off-by: nbuechler <natebuechler@gmail.com>