Partially fixed #36.  It's tough to improve performance while still kieeping this looking good.