Version 1.1

Dramatically simpler