Toward Version 2.0

The current version 1.3 works — barely