Woofer dev

Merging main development branch with master (very old).