Moved spat/spud/stab, refactored json