fucked up CPU
everything but jump attempt 1
Merge remote-tracking branch 'origin/craig'