Fixing jason's broken stuff. 

Also getting a weird error when committing to WallopsGame, so now using my fork.