Going to production soon and locking things down