WHITE WHALE HOLY GRAIL

Slight update to fix starting/stopping issues.