web commit by EthanGlasserCamp: now that at least a few things work right