Initial work on rewriting the fish tank.