Major refactoring..
Oooh.. Did I forget to check in incremental changes? =]
Simple script to test out ONSET.