Added a debug option
Prepped for snapshot build