Up to date w/ Garret's changes
WHITE WHALE HOLY GRAIL

Slight update to fix starting/stopping issues.
Trying to merge files