Gosh this is probably dangerous.  Updates #1