Final push to make a working version