Full rewrite of Jolt