add TODO
pull out couple of values into "static" vars