getting near production ready