tomorrow fix bugs and deploy it as a first shot.