UNSTABLE changes

Committed only because have to change location for a while, and don't
want to lose progress, so really these changes are not ready to be
committed..