Add nightwatch
Add optional scale
Better security