Jimmy dev

Re-doing this as I think something got out of whack.