Hint rework (Not stable)

Not even building at the moment