[UPDATE] major restructuring

breaks compatibility but is far more versatile and flexible