Here we go, a massive commit with a very simple working version