Added ruler stand-in until prog. parses its own
Moved samples into...samples...