Hint rework

Builds but not hint removal etc. doesn't work properly