Some minor changes, it compiles, but I don't really think it works
Need to get some tests, maybe tomorrow or on Wednesday I'll deploy HTF
here