Few more issues cleaned up and it seems to be running