Hacking
We now store history + I fixed some bugs