squash of initial work, version 0.2