tested including context, things look good for v0.1