WIP
use Prednote
update tests, add comments
version bump